From 3e90b96b08c60d1b5c535c2082527058fe25e2cd Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 23 Nov 1998 06:53:07 +0000 Subject: [PATCH] When setting relief, also affect toggle buttons. 1998-11-23 Havoc Pennington * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): (gtk_toolbar_insert_element): When setting relief, also affect toggle buttons. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktoolbar.c | 4 +++- 8 files changed, 45 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f197a6566c..b2fb6c420d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +1998-11-23 Havoc Pennington + + * gtk/gtktoolbar.c: (gtk_toolbar_set_relief): + (gtk_toolbar_insert_element): When setting relief, also affect + toggle buttons. + Sun Nov 22 20:37:06 PST 1998 Manish Singh * gtk/gtkobject.h: remove extraneous comma diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 4970cbabd7..a35e73c100 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -772,6 +772,7 @@ gtk_toolbar_insert_element (GtkToolbar *toolbar, else if (type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON) { child->widget = gtk_toggle_button_new (); + gtk_button_set_relief (GTK_BUTTON (child->widget), toolbar->relief); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (child->widget), FALSE); } @@ -909,7 +910,8 @@ gtk_toolbar_set_button_relief (GtkToolbar *toolbar, for (children = toolbar->children; children; children = children->next) { child = children->data; - if (child->type == GTK_TOOLBAR_CHILD_BUTTON) + if (child->type == GTK_TOOLBAR_CHILD_BUTTON || + child->type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON) gtk_button_set_relief (GTK_BUTTON (child->widget), relief); } -- 2.30.2